Added getTargetMemory, getSsidref methods to XendDomainInfo, and use these and

getDomain, getName in SrvDomainDir, to decouple the latter from the internals of
the former, in preparation for changes internal to XendDomainInfo.

Signed-off-by: Ewan Mellor<ewan@xensource.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 0110462a49ca5c1592ca1028bfcb949199cad586..36e93472df14aa732735f7018337f185abdb0f59 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -334,6 +334,13 @@ class XendDomainInfo:
     def getName(self):
         return self.name
 
+    def getSsidref(self):
+        return self.ssidref
+
+    def getTargetMemory(self):
+        """Get this domain's target memory size, in MiB."""
+        return self.memory
+
     def setStoreRef(self, ref):
         self.store_mfn = ref
         self.storeDom("store/ring-ref", ref)

diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py
index 78066b2f4037419283cb31ffcb14f86e6933a753..c9593aaee612fb04e91e01164fe157faceea9cdb 100644 (file)
--- a/tools/python/xen/xend/server/SrvDomainDir.py
+++ b/tools/python/xen/xend/server/SrvDomainDir.py
@@ -85,7 +85,7 @@ class SrvDomainDir(SrvDir):
     def _op_create_cb(self, dominfo, configstring, req):
         """Callback to handle domain creation.
         """
-        dom = dominfo.name
+        dom = dominfo.getName()
         domurl = "%s/%s" % (req.prePathURL(), dom)
         req.setResponseCode(http.CREATED, "created")
         req.setHeader("Location", domurl)
@@ -112,7 +112,7 @@ class SrvDomainDir(SrvDir):
         fn = FormFn(self.xd.domain_restore,
                     [['file', 'str']])
         dominfo = fn(req.args)
-        dom = dominfo.name
+        dom = dominfo.getName()
         domurl = "%s/%s" % (req.prePathURL(), dom)
         req.setResponseCode(http.CREATED)
         req.setHeader("Location", domurl)
@@ -153,10 +153,10 @@ class SrvDomainDir(SrvDir):
             req.write('<ul>')
             for d in domains:
                req.write('<li><a href="%s%s"> Domain %s</a>'
-                         % (url, d.name, d.name))
-               req.write('id=%s' % d.domid)
-               req.write('memory=%d'% d.memory)
-               req.write('ssidref=%d'% d.ssidref)
+                         % (url, d.getName(), d.getName()))
+               req.write('id=%s' % d.getDomain())
+               req.write('memory=%d'% d.getTargetMemory())
+               req.write('ssidref=%d'% d.getSsidref())
                req.write('</li>')
             req.write('</ul>')